Merge from origin/emacs-25

9daf1cf * etc/NEWS: Improve wording of vc-git-log-output-coding-syste...
0cd2e92 Don't kill ~/ if it's the top level directory
4f40f5f describe-char: fix insert char documentation
87ee542 (vc-git-mode-line-string): Don't use `replace-regexp-in-string'

diff --cc etc/NEWS
Simple merge

diff --cc lisp/dired-aux.el
Simple merge

diff --cc lisp/vc/vc-git.el
Simple merge